just call gtk_cell_view_cell_layout_clear instead of trying to free the

Sun Nov 16 21:48:40 2003  Kristian Rietveld  <kris@gtk.org>

	* gtk/gtkcellview.c (gtk_cell_view_finalize): just call
	gtk_cell_view_cell_layout_clear instead of trying to free the
	structure ourselves here. (#125726, Morten Welinder).

diff --git a/ChangeLog b/ChangeLog
index d5d5ea9b40acdbc5bb1ea55d4cebdc9b11546226..53a5e0ab4f358d90c180d157e0ff0bb9c0206e97 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+Sun Nov 16 21:48:40 2003  Kristian Rietveld  <kris@gtk.org>
+
+       * gtk/gtkcellview.c (gtk_cell_view_finalize): just call
+       gtk_cell_view_cell_layout_clear instead of trying to free the
+       structure ourselves here. (#125726, Morten Welinder).
+
 Sun Nov 16 00:35:29 2003  Matthias Clasen  <maclas@gmx.de>
 
        * gtk/gtkfilechooser.[hc]: 

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index d5d5ea9b40acdbc5bb1ea55d4cebdc9b11546226..53a5e0ab4f358d90c180d157e0ff0bb9c0206e97 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,9 @@
+Sun Nov 16 21:48:40 2003  Kristian Rietveld  <kris@gtk.org>
+
+       * gtk/gtkcellview.c (gtk_cell_view_finalize): just call
+       gtk_cell_view_cell_layout_clear instead of trying to free the
+       structure ourselves here. (#125726, Morten Welinder).
+
 Sun Nov 16 00:35:29 2003  Matthias Clasen  <maclas@gmx.de>
 
        * gtk/gtkfilechooser.[hc]: 

diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4
index d5d5ea9b40acdbc5bb1ea55d4cebdc9b11546226..53a5e0ab4f358d90c180d157e0ff0bb9c0206e97 100644 (file)
--- a/ChangeLog.pre-2-4
+++ b/ChangeLog.pre-2-4
@@ -1,3 +1,9 @@
+Sun Nov 16 21:48:40 2003  Kristian Rietveld  <kris@gtk.org>
+
+       * gtk/gtkcellview.c (gtk_cell_view_finalize): just call
+       gtk_cell_view_cell_layout_clear instead of trying to free the
+       structure ourselves here. (#125726, Morten Welinder).
+
 Sun Nov 16 00:35:29 2003  Matthias Clasen  <maclas@gmx.de>
 
        * gtk/gtkfilechooser.[hc]: 

diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index d5d5ea9b40acdbc5bb1ea55d4cebdc9b11546226..53a5e0ab4f358d90c180d157e0ff0bb9c0206e97 100644 (file)
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,9 @@
+Sun Nov 16 21:48:40 2003  Kristian Rietveld  <kris@gtk.org>
+
+       * gtk/gtkcellview.c (gtk_cell_view_finalize): just call
+       gtk_cell_view_cell_layout_clear instead of trying to free the
+       structure ourselves here. (#125726, Morten Welinder).
+
 Sun Nov 16 00:35:29 2003  Matthias Clasen  <maclas@gmx.de>
 
        * gtk/gtkfilechooser.[hc]: 

diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index d5d5ea9b40acdbc5bb1ea55d4cebdc9b11546226..53a5e0ab4f358d90c180d157e0ff0bb9c0206e97 100644 (file)
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,9 @@
+Sun Nov 16 21:48:40 2003  Kristian Rietveld  <kris@gtk.org>
+
+       * gtk/gtkcellview.c (gtk_cell_view_finalize): just call
+       gtk_cell_view_cell_layout_clear instead of trying to free the
+       structure ourselves here. (#125726, Morten Welinder).
+
 Sun Nov 16 00:35:29 2003  Matthias Clasen  <maclas@gmx.de>
 
        * gtk/gtkfilechooser.[hc]: 

diff --git a/gtk/gtkcellview.c b/gtk/gtkcellview.c
index f8ffa926cfb6bb70c5184a11f19972eb2d751e60..1dd8ff64471c4b81beabcf1e5e0fccb800fcf423 100644 (file)
--- a/gtk/gtkcellview.c
+++ b/gtk/gtkcellview.c
@@ -289,12 +289,7 @@ gtk_cell_view_finalize (GObject *object)
 {
   GtkCellView *cellview = GTK_CELL_VIEW (object);
 
-  if (cellview->priv->cell_list)
-    {
-      g_list_foreach (cellview->priv->cell_list, (GFunc)g_free, NULL);
-      g_list_free (cellview->priv->cell_list);
-    }
-  cellview->priv->cell_list = NULL;
+  gtk_cell_view_cell_layout_clear (GTK_CELL_LAYOUT (object));
 
   if (G_OBJECT_CLASS (parent_class)->finalize)
     (* G_OBJECT_CLASS (parent_class)->finalize) (object);